Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Apr 2010 22:47:29 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Apr 2010 22:47:29 +0000 (22:47 +0000)

Trivial merge